From: Markus Rost <rost@math.uni-bielefeld.de>
Date: Wed, 21 Jan 2004 12:35:55 +0000 (+0000)
Subject: (rmail-convert-to-babyl-format): Avoid deleting trailing white space
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~24410
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e5a01651e8801f617a56a256769f3340176cc951;p=emacs.git

(rmail-convert-to-babyl-format): Avoid deleting trailing white space
and ensure a final newline.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index f8abc2a910d..462919d36d4 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1890,7 +1890,13 @@ It returns t if it got any new messages."
 		       (when
 			   (condition-case nil
 			       (progn
-				 (base64-decode-region (1+ header-end) (point))
+				 (base64-decode-region
+				  (1+ header-end)
+				  (save-excursion
+				    ;; Prevent base64-decode-region
+				    ;; from removing newline characters.
+				    (skip-chars-backward "\n\t ")
+				    (point)))
 				 t)
 			     (error nil))
 			 (goto-char header-end)
@@ -1908,6 +1914,7 @@ It returns t if it got any new messages."
 		   (goto-char (point-min))
 		   (while (search-forward "\n\^_" nil t); single char
 		     (replace-match "\n^_")))); 2 chars: "^" and "_"
+	       (or (bolp) (newline)) ; in case we lost the final newline.
 	       (insert ?\^_)
 	       (setq last-coding-system-used nil)
 	       (or rmail-enable-mime